From 224ae6fbaf7a057d109b55735cfa22a02afd70af Mon Sep 17 00:00:00 2001
From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Mon, 28 Nov 2022 17:32:19 +0000
Subject: [PATCH] javadoc-optional

Gemeinsame Unterverzeichnisse: odk-old/config und odk/config.
Gemeinsame Unterverzeichnisse: odk-old/docs und odk/docs.
Gemeinsame Unterverzeichnisse: odk-old/examples und odk/examples.

Gemeinsame Unterverzeichnisse: odk-old/config und odk/config.
Gemeinsame Unterverzeichnisse: odk-old/docs und odk/docs.
Gemeinsame Unterverzeichnisse: odk-old/examples und odk/examples.

Gbp-Pq: Name javadoc-optional.diff
---
 Repository.mk             |   2 +-
 configure.ac              | Bin 532719 -> 533438 bytes
 odk/CustomTarget_check.mk |   2 +-
 odk/Module_odk.mk         |   6 ++++--
 odk/util/check.pl         |   2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Repository.mk b/Repository.mk
index 35c0b746c7c..fc8819193fa 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -919,7 +919,7 @@ $(eval $(call gb_Helper_register_packages_for_install,sdk,\
 	offapi_idl \
 	udkapi_idl \
 	$(if $(ENABLE_JAVA), \
-		odk_javadoc \
+		$(if $(JAVADOC),odk_javadoc) \
 		odk_uno_loader_classes \
 	) \
 ))
diff --git a/configure.ac b/configure.ac
index 79dcf645a0dae9dc43a54ec46a71891f49733839..f4b47b24a88e31c0eb060540b29a82b73921e7eb 100644
GIT binary patch
delta 566
zcmZ8eOK1~O6y;6sbS5KeKCP)S;!9eoLIsO;nMK;77{OMeB1j0)Ow!4end*$TuB^Jq
zuC0vrY}(1VaxEyujVLZO5!}|5f}(WivMbS-HWc*2S-f-4z4sj6uebd5d%p03eKz-L
zT-3FC`A)fF-za+b-}S+-v#8Q#Fk55E-N)}b8=}0>;<(8MhPoPFF`V-C8QtME-O_KB
zUBkAxUFDM#=lQnSHQ5;4n=B2j$YQ(OF4kBatvZVz*)~xe9^NrCXSma)?(Xbe-6=L&
zCKHeZLhCJ)R!5?`)wx)*D`tkLv)r<A@{F9sy$vM-zA3Bt^ngy`rBAUQea6wXFrLrJ
z@sP;qJ&mUDeNA*@K8>PH>Rtp7DU7Q=rM#&=T6s)_d7loUy(*<(e<clX*609~Z<O$s
zM#JD+65*#$2~2$y{GKL_;KP>GX{z4xh0~aCQWncrNWmYEWV~w9VI&`g5?FjjDt<KS
z1Xi9<zxO4sA`=L0u_37_1$1z*^BtY48d{j|SP%2tmZQ5opSzNqm>d^bq8n0g<X^IC
zU@4$vzft9`?zlWN*p;6voXv|V5j&Coe?-fTmkO813YU&`#h9Izdl6Zr{f%}&0<u8Q
KdOJ{#F8l?S#lM{Z

delta 228
zcmdmYT;cseg@!GRH?rF+a~Xk{35c1uSLU+x8cw&L&7v~>{VP_E>38c`l&0UA%_2Cx
zW<HDf<Qf@{>Br`?7*GG-!XhzUbODgCXk`(a?!16SX8MLXEG*O07qCcA*LuVvH+{td
z7OCl{ma~aZS6Iu&GX2p47V+s5elhY*=U>QTIDH2zo8aUP(!A66*8$Z|S;%4w(SLU#
zi|q6db6NPOOD<y3ojx^?Nnm=~BB1Q*MJ$rjEq1Z<b9gz1IlA~eYfk4`476ckCA;jj
W`7A8$GZ%v}D-g47pShS_wE+OQ3sv?2

diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
index 0286cc6cdc6..f833c8b36fc 100644
--- a/odk/CustomTarget_check.mk
+++ b/odk/CustomTarget_check.mk
@@ -36,7 +36,7 @@ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \
 		$(if $(filter WNT,$(OS)),$(call gb_Package_get_target,odk_config_win)) \
 		$(call gb_Package_get_target,odk_docs) \
 		$(call gb_Package_get_target,odk_html) \
-		$(if $(ENABLE_JAVA),$(call gb_GeneratedPackage_get_target,odk_javadoc)) \
+		$(if $(JAVADOC),$(call gb_GeneratedPackage_get_target,odk_javadoc)) \
 		$(call gb_Package_get_target,odk_settings) \
 		$(call gb_Package_get_target,odk_settings_generated)
 ifneq ($(gb_SUPPRESS_TESTS),)
diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk
index 16eba69c3e3..0d5fca58d2c 100644
--- a/odk/Module_odk.mk
+++ b/odk/Module_odk.mk
@@ -42,8 +42,10 @@ endif
 ifneq ($(ENABLE_JAVA),)
 $(eval $(call gb_Module_add_targets,odk,\
 	CustomTarget_classes \
-	CustomTarget_javadoc \
-	GeneratedPackage_odk_javadoc \
+	$(if $(JAVADOC),\
+		CustomTarget_javadoc \
+		GeneratedPackage_odk_javadoc \
+	) \
 	GeneratedPackage_uno_loader_classes \
 ))
 endif
diff --git a/odk/util/check.pl b/odk/util/check.pl
index 377c8be0dc5..fc0daf1ed53 100644
--- a/odk/util/check.pl
+++ b/odk/util/check.pl
@@ -184,7 +184,7 @@ if (-d "$SdkDir") {
     # improvement required
     my $solar_java = $ENV{"ENABLE_JAVA"};
     my $JDK = $ENV{"JDK"};
-    if (defined($solar_java) && $solar_java ne "" && (!defined($JDK) || $JDK ne "gcj")) {
+    if (defined($solar_java) && $solar_java ne "" && $ENV{"JAVADOC"} ne "") {
     print "check java docu: ";
     if (check_dir("docs/java/ref")) {
         if (!check_file("docs/java/ref/index.html")) {
-- 
2.30.2